Skip to content

Updating from Neb dev #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
MistakeNot4892 wants to merge 56 commits into from
Closed

Updating from Neb dev #106

MistakeNot4892 wants to merge 56 commits into from

Conversation

@MistakeNot4892
Copy link

@MistakeNot4892 MistakeNot4892 commented Dec 6, 2024

No description provided.

MistakeNot4892 and others added 30 commits November 22, 2024 22:29
@MistakeNot4892
Vending machine and smartfridge cleanup and icon fixes.
db92f01
@MistakeNot4892
Unit test name consistency pass (sorry).
8f7fa93
@MistakeNot4892
Requested tweaks.
ea17fad
@noelle-lavenza
Fix drake salve aura never expiring
80cdec6
@noelle-lavenza
Fix shredded paper burning
8433b32
@noelle-lavenza
Readd aggressive grabs applying pressure to wounds
11209ca
@noelle-lavenza
Rewrite injury self-examination
f5f2f81
@noelle-lavenza
Make clicking the health doll examine yourself for injuries
03f18a3
@out-of-phaze
Merge pull request #4578 from MistakeNot4892/fixes/scav
fc25ecc 
Vendor and smartfridge cleanup.
@MistakeNot4892
Implementing Doe's new banners.
da7c767
@MistakeNot4892
Merge pull request #4580 from noelle-lavenza/fix/stage-drakepaper
9f8cd90 
Fix drake salve aura never expiring
@MistakeNot4892
Merge pull request #4579 from noelle-lavenza/feature/selfpain
3df4e19 
Refactor injury self-examination, readd wound pressure via agrab
@NebulaSS13Bot
Automatic changelog generation [ci skip]
5a846bf
@noelle-lavenza
Fix mapped large casks having invisible contents
af8f42d
@noelle-lavenza
Add athletics check to barrel stacking
9f4738a
@MistakeNot4892
Adding Doe's signs.
cb99092
@MistakeNot4892
Merge pull request #4584 from noelle-lavenza/fix/cask-mapped
95c5050 
Cask rack fixes and tweaks
@NebulaSS13Bot
Automatic changelog generation [ci skip]
c960b10
@noelle-lavenza
Fix bots being treated as SSD on interact
8c2dfd6
@noelle-lavenza
Fix dirt being nameless when bots clean it
f20e7e5
@noelle-lavenza
Fix AI unarmed attacks doing nothing
29c2d86
@noelle-lavenza
Fix hugging bots instead of opening their menu
594a6dd
@MistakeNot4892
Reworking banners to address feedback.
0a99bb6
@MistakeNot4892
Updating modpack banners.
d19df16
@MistakeNot4892
Merge pull request #4586 from noelle-lavenza/fix/bot-ai
9be5b1f 
Fix AI unarmed attacks
@NebulaSS13Bot
Automatic changelog generation [ci skip]
9199568
@MistakeNot4892
Adding a priority list system for mouse cursor icons.
7ac5722
@noelle-lavenza
Add tech levels to slapcrafting recipes
5d27cfc
@noelle-lavenza
Add on-examine and alt interaction functionality to stock parts
2aa5e64
@noelle-lavenza
Make research machines use disk reader components
4f559f2
noelle-lavenza and others added 26 commits December 2, 2024 21:00
@noelle-lavenza
Add cupholder stock part
4cde3d4
@MistakeNot4892
Cleaning up a lot of sprite_sheets setting.
fcfc41b
@MistakeNot4892
Merge pull request #4595 from noelle-lavenza/fix/medieval-slapcrafting
1c1fd60 
Add tech levels to slapcrafting recipes
@MistakeNot4892
Merge pull request #4597 from noelle-lavenza/feature/cupholders
3c0ab20 
Update item holder parts, add cupholders
@NebulaSS13Bot
Automatic changelog generation for PR #4597 [ci skip]
3e0ac94
@MistakeNot4892
Merge pull request #4599 from NebulaSS13/staging
cccedb5 
Updating dev from staging.
@MistakeNot4892
Adding a lounge.
71a5a78
@out-of-phaze
Merge pull request #4587 from MistakeNot4892/feature/pointer_priority
9597ae7 
Adding a priority list system for mouse cursor icons.
@out-of-phaze
Merge pull request #4582 from MistakeNot4892/feature/banners
486c851 
Implementing Doe's new banners and signs.
@MistakeNot4892
Replacing wooden plank furniture with chipboard laminate furniture.
43b1ef4
@MistakeNot4892
Adding wood laminate flooring for space maps.
7242145
@MistakeNot4892
Cleaning up bench/table/flooring chipboard commits.
0bf1d38
@MistakeNot4892
Generic wood is now an abstract type, 'default' wood is oak.
e0a61df
@MistakeNot4892
Repathing mapped tables.
26f4f08
@MistakeNot4892
Condensing/repathing wooden floor tile types.
d5a3d85
@NebulaSS13Bot
Automatic changelog generation [ci skip]
1a64b49
@out-of-phaze
Merge pull request #4598 from MistakeNot4892/tweak/sprite_setting
a37b9ed 
Cleaning up a lot of sprite_sheets setting.
@MistakeNot4892
Intents are now /decl/intent.
0b25b72
@MistakeNot4892
Updating deity code to work with decl intents, also correcting 'pheno…
b31b0f7 
…menas'.
@MistakeNot4892
Intent selector is now dynamically generated.
46606cf
@MistakeNot4892
Updating set_intent() to use flags instead of types.
d2752cb
@MistakeNot4892
Commenting out nymph intent selection/subtypes due to issues with int…
7348e0a 
…eractions.
@out-of-phaze
Merge pull request #4585 from MistakeNot4892/rework/intent
b838d36 
Intents are now /decl/intent.
@out-of-phaze
Merge pull request #4583 from MistakeNot4892/feature/chipboard
b382cf2 
[MDB IGNORE] Adds chipboard floors and tables.
@NebulaSS13Bot
Automatic changelog generation for PR #4583 [ci skip]
85b9c56
@out-of-phaze
Merge pull request #4604 from MistakeNot4892/feature/lounge
47e8d2b 
Adding a lounge.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@MistakeNot4892 @noelle-lavenza @out-of-phaze @NebulaSS13Bot